auto upstream
authorJoakim Verona <joakim@verona.se>
Sun, 23 Dec 2012 14:56:03 +0000 (15:56 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 23 Dec 2012 14:56:03 +0000 (15:56 +0100)

Trivial merge